Index: applications/party/template/party/profileblocks/Content.ftl
===================================================================
--- applications/party/template/party/profileblocks/Content.ftl	(revision 1861813)
+++ applications/party/template/party/profileblocks/Content.ftl	(working copy)
@@ -54,16 +54,5 @@
         </select>
         <input type="submit" value="${uiLabelMap.CommonUpload}" />
       </form>
-      <div id='progress_bar'><div></div></div>
     </div>
-  </div>
-  <script type="application/javascript">
-    jQuery("#uploadPartyContent").validate({
-        submitHandler: function(form) {
-            <#-- call upload scripts - functions defined in PartyProfileContent.js -->
-            uploadPartyContent();
-            getUploadProgressStatus();
-            form.submit();
-        }
-    });
-  </script>
+  </div>
\ No newline at end of file
Index: applications/party/webapp/partymgr/WEB-INF/controller.xml
===================================================================
--- applications/party/webapp/partymgr/WEB-INF/controller.xml	(revision 1861813)
+++ applications/party/webapp/partymgr/WEB-INF/controller.xml	(working copy)
@@ -990,8 +990,8 @@
     <request-map uri="uploadPartyContent">
         <security auth="true" https="true"/>
         <event type="service" invoke="uploadPartyContentFile"/>
-        <response name="success" type="view" value="partyContentList"/>
-        <response name="error" type="view" value="EventMessages"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="viewprofile"/>
     </request-map>
 
     <request-map uri="partyContentList">
Index: applications/party/widget/partymgr/ProfileScreens.xml
===================================================================
--- applications/party/widget/partymgr/ProfileScreens.xml	(revision 1861813)
+++ applications/party/widget/partymgr/ProfileScreens.xml	(working copy)
@@ -44,7 +44,7 @@
                     <order-by field-name="-fromDate"/>
                 </entity-and>
                 <set field="partyContentId" from-field="partyContentList[0].contentId"/>
-                <set field="partyContent" value="${groovy: partyContentId!=null?'/content/control/stream?contentId=' + partyContentId + externalKeyParam : ''}"/>
+                <set field="partyContent" value="${groovy: partyContentId!=null?'/partymgr/control/stream?contentId=' + partyContentId + externalKeyParam : ''}"/>
                 <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}" global="true"/>
                 <set field="personalImage" from-field="partyContent"/>
             </actions>
Index: themes/rainbowstone/template/includes/Avatar.ftl
===================================================================
--- themes/rainbowstone/template/includes/Avatar.ftl	(revision 1861813)
+++ themes/rainbowstone/template/includes/Avatar.ftl	(working copy)
@@ -19,7 +19,7 @@
 
 <div id="user-avatar" onclick="showHideUserPref()">
 <#if avatarDetail??>
-    <img src="/content/control/stream?contentId=${avatarDetail.contentId}" alt="user">
+    <img src="<@ofbizUrl>stream?contentId=${avatarDetail.contentId}</@ofbizUrl>" alt="user">
 <#else>
     <img src="/rainbowstone/images/avatar.svg" alt="user">
 </#if>
@@ -26,7 +26,7 @@
     <div id="user-details" style="display:none;">
         <div id="user-row1">
         <#if avatarDetail??>
-            <img src="/content/control/stream?contentId=${avatarDetail.contentId}" alt="user">
+            <img src="<@ofbizUrl>stream?contentId=${avatarDetail.contentId}</@ofbizUrl>" alt="user">
         <#else>
             <img src="/rainbowstone/images/avatar.svg" alt="user">
         </#if>
